diff -Nur nvclock0.8b4.orig/Makefile.in nvclock0.8b4/Makefile.in
--- nvclock0.8b4.orig/Makefile.in	2008-05-11 05:25:44.000000000 -0500
+++ nvclock0.8b4/Makefile.in	2009-01-07 16:19:12.437689102 -0600
@@ -5,6 +5,9 @@
 mandir=${prefix}/man
 DOCS= ABOUT AUTHORS ChangeLog FAQ README
 
+CFLAGS=@CFLAGS@
+CXXFLAGS=@CXXFLAGS@
+
 all:
 	$(MAKE) -C src all
 
diff -Nur nvclock0.8b4.orig/configure nvclock0.8b4/configure
--- nvclock0.8b4.orig/configure	2008-08-16 11:53:59.000000000 -0500
+++ nvclock0.8b4/configure	2009-01-07 16:24:27.896687454 -0600
@@ -3726,7 +3726,6 @@
 
 
 
-CFLAGS=
 HAVE_GTK2=no
 HAVE_QT=no
 HAVE_NVCONTROL=no
diff -Nur nvclock0.8b4.orig/src/Makefile.in nvclock0.8b4/src/Makefile.in
--- nvclock0.8b4.orig/src/Makefile.in	2009-01-03 11:02:54.000000000 -0600
+++ nvclock0.8b4/src/Makefile.in	2009-01-07 16:26:38.506689444 -0600
@@ -1,5 +1,6 @@
 CC=@CC@
 INSTALL=@INSTALL@
+CFLAGS=@CFLAGS@
 
 nvclock_SOURCES=nvclock.c
 smartdimmer_SOURCES=smartdimmer.c
@@ -31,10 +32,10 @@
 
 
 nvclock: $(DEPS) $(LIB) nvclock.c
-	$(CC) -o nvclock $(nvclock_SOURCES) $(INCLUDES) $(LIBS)
+	$(CC) $(CFLAGS) -o nvclock $(nvclock_SOURCES) $(INCLUDES) $(LIBS)
 
 smartdimmer: $(DEPS) $(LIB) smartdimmer.c
-	$(CC) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS)
+	$(CC) $(CFLAGS) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS)
 
 
 clean: clean-recursive clean-app
diff -Nur nvclock0.8b4.orig/src/backend/Makefile.in nvclock0.8b4/src/backend/Makefile.in
--- nvclock0.8b4.orig/src/backend/Makefile.in	2007-12-27 10:05:38.000000000 -0600
+++ nvclock0.8b4/src/backend/Makefile.in	2009-01-07 16:32:28.089689122 -0600
@@ -1,11 +1,12 @@
-CC=@CC@ -O0
+CC=@CC@
 AR=ar
 RANLIB=@RANLIB@
 
 system=@system@
 HAVE_NVCONTROL=@HAVE_NVCONTROL@
 OBJECTS=backend.o bios.o config.o error.o nv30.o nv40.o nv50.o info.o overclock.o utils.o i2c.o xf86i2c.o adt7473.o f75375.o lm99.o w83781d.o w83l785r.o libc_wrapper.o
-CFLAGS=@X11_CFLAGS@ -I../.. -I../nvcontrol
+CFLAGS=@CFLAGS@
+CFLAGS+=@X11_CFLAGS@ -I../.. -I../nvcontrol
 
 ifeq ($(system), FreeBSD)
     OBJECTS+=back_bsd.o
@@ -36,4 +37,4 @@
 	rm -f Makefile
 
 install:
-uninstall:
\ No newline at end of file
+uninstall:
diff -Nur nvclock0.8b4.orig/src/gtk/Makefile.in nvclock0.8b4/src/gtk/Makefile.in
--- nvclock0.8b4.orig/src/gtk/Makefile.in	2008-05-11 05:25:46.000000000 -0500
+++ nvclock0.8b4/src/gtk/Makefile.in	2009-01-07 16:28:51.865688400 -0600
@@ -1,7 +1,8 @@
 CC=@CC@
 INSTALL=@INSTALL@
 
-CFLAGS=@GTK_CFLAGS@ -I../backend -I../nvcontrol -I../..
+CFLAGS=@CFLAGS@
+CFLAGS+=@GTK_CFLAGS@ -I../backend -I../nvcontrol -I../..
 HAVE_GTK2=@HAVE_GTK2@
 HAVE_NVCONTROL=@HAVE_NVCONTROL@
 libbackend=../backend/libbackend.a
diff -Nur nvclock0.8b4.orig/src/nvcontrol/Makefile.in nvclock0.8b4/src/nvcontrol/Makefile.in
--- nvclock0.8b4.orig/src/nvcontrol/Makefile.in	2005-12-09 13:46:05.000000000 -0600
+++ nvclock0.8b4/src/nvcontrol/Makefile.in	2009-01-07 16:29:09.340689195 -0600
@@ -2,7 +2,8 @@
 AR=ar
 RANLIB=@RANLIB@
 system=@system@
-CFLAGS=@X11_CFLAGS@ -I../backend
+CFLAGS=@CFLAGS@
+CFLAGS+=@X11_CFLAGS@ -I../backend
 HAVE_X11=@HAVE_NVCONTROL@
 OBJECTS=libnvcontrol.o nvcontrol.o
 
@@ -26,4 +27,4 @@
 	rm -f Makefile
 
 install:
-uninstall:
\ No newline at end of file
+uninstall:
diff -Nur nvclock0.8b4.orig/src/qt/Makefile.in nvclock0.8b4/src/qt/Makefile.in
--- nvclock0.8b4.orig/src/qt/Makefile.in	2008-05-11 05:25:46.000000000 -0500
+++ nvclock0.8b4/src/qt/Makefile.in	2009-01-07 16:29:42.410690235 -0600
@@ -3,7 +3,8 @@
 MOC=@MOC@
 
 OBJECTS=main.o qt_nvclock.o qt_nvclock.moc.o qt_xfree.o qt_xfree.moc.o
-CXXFLAGS=@QT_CFLAGS@ -I../backend
+CXXFLAGS=@CXXFLAGS@
+CXXFLAGS+=@QT_CFLAGS@ -I../backend
 HAVE_NVCONTROL=@HAVE_NVCONTROL@
 HAVE_QT=@HAVE_QT@
 libbackend=../backend/libbackend.a
